bitkeeper revision 1.25 (3e492a23vrV6G7nvPEIWmSIcQxdFNw)

merge with latest changeset

diff --cc .rootkeys
index 5e27692d431e01e12bdc015e16152b3ac7a3288a,2304c74597e8c0624892cf1855b2d3c9265b71b3..0b792c5ac03f4bec7237b45711ea4684b2387091
--- 1/.rootkeys
--- 2/.rootkeys
+++ b/.rootkeys
@@@ -160,7 -174,7 +176,8 @@@
  3ddb79c3e9DCEoR-WzNxcOQDzLu7BQ xen-2.4.16/include/asm-i386/softirq.h
  3ddb79c3NiyQE2vQnyGiaBnNjBO1rA xen-2.4.16/include/asm-i386/spinlock.h
  3ddb79c3ezddh34MdelJpa5tNR00Dw xen-2.4.16/include/asm-i386/system.h
 +3e397e66xPNc8eaSqC9pPbyAtRGzHA xen-2.4.16/include/asm-i386/time.h
+ 3e450943TfE-iovQIY_tMO_VdGsPhA xen-2.4.16/include/asm-i386/timex.h
  3ddb79c4HugMq7IYGxcQKFBpKwKhzA xen-2.4.16/include/asm-i386/types.h
  3ddb79c3M2n1ROZH6xk3HbyN4CPDqg xen-2.4.16/include/asm-i386/uaccess.h
  3ddb79c3uPGcP_l_2xyGgBSWd5aC-Q xen-2.4.16/include/asm-i386/unaligned.h
@@@ -171,7 -185,7 +188,8 @@@
  3ddb79c4R4iVwqIIeychVQYmIH4FUg xen-2.4.16/include/scsi/scsi_ioctl.h
  3ddb79c4yw_mfd4Uikn3v_IOPRpa1Q xen-2.4.16/include/scsi/scsicam.h
  3ddb79c4HKPMLvDBP9LxzPi_szVxGA xen-2.4.16/include/scsi/sg.h
+ 3e450943xQztorJxTGW3BPZ4LhRHbw xen-2.4.16/include/stdarg.h
 +3e397e66m2tO3s-J8Jnr7Ws_tGoPTg xen-2.4.16/include/xeno/ac_timer.h
  3ddb79c0nTsjSpVK4ZVTI9WwN24xtQ xen-2.4.16/include/xeno/blk.h
  3ddb79c0dVhTHLsv6CPTf4baKix4mA xen-2.4.16/include/xeno/blkdev.h
  3ddb79c18ePBgitnOs7GiOCFilODVw xen-2.4.16/include/xeno/blkpg.h

diff --cc xen-2.4.16/arch/i386/apic.c
Simple merge

diff --cc xen-2.4.16/arch/i386/entry.S
Simple merge

diff --cc xen-2.4.16/common/domain.c
index 0392d2b3a303b0383a3f8c9435dbd0d9d5b8a76d,61323d764db5ba66a82843dee2935f8f480034d3..046b2f587869ae7204ed329a85756eb54d199cf4
--- 1/xen-2.4.16/common/domain.c
--- 2/xen-2.4.16/common/domain.c
+++ b/xen-2.4.16/common/domain.c
@@@ -140,7 -244,9 +139,7 @@@ long kill_other_domain(unsigned int dom
  /* Release resources belonging to task @p. */
  void release_task(struct task_struct *p)
  {
-     //ASSERT(!__task_on_runqueue(p));
+     struct list_head *list_ent, *tmp;
 -
 -    ASSERT(!__task_on_runqueue(p));
      ASSERT(p->state == TASK_DYING);
      ASSERT(!p->has_cpu);
      write_lock_irq(&tasklist_lock);
@@@ -385,11 -537,10 +357,11 @@@ int setup_guestos(struct task_struct *p
      unsigned long phys_l1tab, phys_l2tab;
      unsigned long cur_address, alloc_address;
      unsigned long virt_load_address, virt_stack_address, virt_shinfo_address;
 +    unsigned long virt_ftable_start, virt_ftable_end, ft_mapping;
      start_info_t  *virt_startinfo_address;
+     unsigned long long time;
      unsigned long count;
      unsigned long alloc_index;
-     unsigned long ft_pages;
      l2_pgentry_t *l2tab, *l2start;
      l1_pgentry_t *l1tab = NULL, *l1start = NULL;
      struct pfn_info *page = NULL;

diff --cc xen-2.4.16/common/kernel.c
Simple merge

diff --cc xen-2.4.16/include/hypervisor-ifs/hypervisor-if.h
Simple merge

diff --cc xen-2.4.16/include/xeno/sched.h
index 9f5917c969091710dc853e66209ba127fc7260c9,6f2863e8a557d4b190f45503fe6644568f94357a..c4caa4c431c9f7bca8a034b5960d1f909de89202
--- 1/xen-2.4.16/include/xeno/sched.h
--- 2/xen-2.4.16/include/xeno/sched.h
+++ b/xen-2.4.16/include/xeno/sched.h
@@@ -60,18 -60,9 +60,10 @@@ extern struct mm_struct init_mm
  struct task_struct {
  
      int processor;
 -    int state, hyp_events;
 +    int state;
 +      int hyp_events;
      unsigned int domain;
  
-     /* index into frame_table threading pages belonging to this
-      * domain together. these are placed at the top of the structure
-      * to avoid nasty padding for various kernel structs when using
-      * task_struct in user space
-      */
-     unsigned long pg_head;
-     unsigned int tot_pages;
- 
      /* An unsafe pointer into a shared data area. */
      shared_info_t *shared_info;
      

diff --cc xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor.h
Simple merge